Merge after removing dependency on linux-2.6.11 source tree
authordjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Mon, 8 Aug 2005 19:21:23 +0000 (12:21 -0700)
committerdjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Mon, 8 Aug 2005 19:21:23 +0000 (12:21 -0700)

Trivial merge